🎖️GitЯра🎖️
Commit e5aa317d0d2272a69ffa942c025d9aafe5acd89c
Parents : be7d685
Author : James Rich <2199651+jamesarich@users.noreply.github.com>
Signature : Signature validation error
Date : 2026-08-19T18:25:02-07:00
Committer : GitHub <noreply@github.com>
Date : 2026-08-19T20:25:02-05:00
fix(build): pin Gradle back to 9.6.1 and block the 9.7 line (#6786)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Changes
5 files changed, 17 insertions(+), 9 deletions(-)
Diff
diff --git a/.github/renovate.json b/.github/renovate.json
index 04a3045f77..e1c3861bd8 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -96,7 +96,7 @@
"automerge": false
},
{
- "description": "Block Gradle 9.7.0: its ExecOperations.exec spec defaults standardOutput to null, crashing the Compose Multiplatform proguardReleaseJars task (ExternalToolRunner reads the stream back). Lift once a fixed Gradle patch or a CMP release that stops reading spec.standardOutput is out. Matches by depName so the flatpak-manifest custom manager (customManagers below) is pinned identically and can never propose the blocked version on its own.",
+ "description": "Block the Gradle 9.7 line. 9.7.0 crashed CMP's proguardReleaseJars (ExecSpec stdout null); 9.7.1 fixed that but broke main CI twice over (bumped in #6777, reverted next day): the configuration-cache fingerprint crashes reloading its own same-key entries (IsInIdeaSyncValueSource CNFE), and CMP's Windows packaging trips an Isolated Projects violation (':desktopApp' cannot access Project.layout on ':'). Lift only after a 9.7.x/9.8 patch proves out on both counts. Matches by depName so the flatpak-manifest custom manager (customManagers below) is pinned identically and can never propose the blocked version on its own.",
"matchDepNames": [
"gradle"
],
@@ -104,7 +104,7 @@
"gradle-wrapper",
"custom.regex"
],
- "allowedVersions": "!/^9\\.7\\.0$/"
+ "allowedVersions": "!/^9\\.7\\./"
},
{
"description": "Disable automerge for major updates (safety net)",
diff --git a/.github/workflows/reusable-check.yml b/.github/workflows/reusable-check.yml
index 335e4a9969..82fecf069c 100644
--- a/.github/workflows/reusable-check.yml
+++ b/.github/workflows/reusable-check.yml
@@ -451,7 +451,8 @@ jobs:
# -Dorg.gradle.isolated-projects=false: the dependency-graph plugin injected by setup-gradle force-resolves
# via allprojects{}, which Isolated Projects forbids (fatal since Gradle 9.7). The property form is
# used everywhere instead of --no-isolated-projects: that flag only exists on Gradle 9.7+, and the
- # wrapper is pinned to 9.6.1 until gradle/gradle#38787 ships in 9.7.1.
+ # wrapper is pinned to 9.6.1 (9.7.1 broke the CC fingerprint and CMP Windows packaging — see
+ # gradle-wrapper.properties and the renovate.json block on the 9.7 line).
run: ./gradlew androidApp:assembleFdroidDebug androidApp:assembleGoogleDebug -Pci=true --parallel --configuration-cache -Dorg.gradle.isolated-projects=false --continue
- name: Upload debug artifact
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index eddabd2eef..b1b8ef56b4 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 760c45969c..a917b5ca28 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,9 +1,16 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
-networkTimeout=10000
-retries=0
+# -bin: nothing here reads -all's docs/sources. Update sha256 with the URL on upgrades
+# (official .sha256 sits next to the distribution; renovate does both).
+# Pinned back to 9.6.1 again: 9.7.1 fixed 9.7.0's ExecSpec stdout crash (gradle#38787)
+# but broke main CI two new ways — the configuration-cache fingerprint crashes reloading
+# its own same-key entries (IsInIdeaSyncValueSource CNFE in the settings-plugin scope),
+# and CMP's Windows packaging trips an Isolated Projects violation (':desktopApp' cannot
+# access Project.layout on ':'). Renovate blocks the 9.7 line; lift with renovate.json.
+distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+networkTimeout=30000
+retries=3
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/scripts/verify-flatpak/desktop-offline.yaml b/scripts/verify-flatpak/desktop-offline.yaml
index 779b8056cc..6eb40ef885 100644
--- a/scripts/verify-flatpak/desktop-offline.yaml
+++ b/scripts/verify-flatpak/desktop-offline.yaml
@@ -101,8 +101,8 @@ modules:
# flavor); distributionSha256Sum verifies this file. Renovate bumps the version here
# alongside wrapper bumps (custom manager in renovate.json) but the sha256 must be
# copied from distributionSha256Sum by hand; CI fails fast on any mismatch.
- url: https://services.gradle.org/distributions/gradle-9.7.1-bin.zip
- sha256: acd53f1edaf02f1a8ff99879f8a34b302661a057d9b063ae9e35b552f804d20a
+ url: https://services.gradle.org/distributions/gradle-9.6.1-bin.zip
+ sha256: 9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14
dest: "gradle/wrapper"
dest-filename: "gradle-bin.zip"
- flatpak-sources.json
Served by rngit 1.5.2 - Generated in 0.12s